src/libostree/ostree-repo-deprecated.h \
$(NULL)
+if ENABLE_EXPERIMENTAL_API
+libostree_public_headers += \
+ src/libostree/ostree-remote.h \
+ $(NULL)
+endif
+
# This one is generated via configure.ac, and the gtk-doc
# code hence needs to look in the builddir.
libostree_public_built_headers = src/libostree/ostree-version.h
src/libostree/ostree-linuxfsutil.c \
src/libostree/ostree-diff.c \
src/libostree/ostree-mutable-tree.c \
+ src/libostree/ostree-remote.c \
+ src/libostree/ostree-remote-private.h \
src/libostree/ostree-repo.c \
src/libostree/ostree-repo-checkout.c \
src/libostree/ostree-repo-commit.c \
src/libostree/ostree-tls-cert-interaction.h \
$(NULL)
endif
+if !ENABLE_EXPERIMENTAL_API
+libostree_1_la_SOURCES += \
+ src/libostree/ostree-remote.h \
+ $(NULL)
+endif
libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/bsdiff -I$(srcdir)/libglnx -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -I$(builddir)/src/libostree \
$(OT_INTERNAL_GIO_UNIX_CFLAGS) $(OT_INTERNAL_GPGME_CFLAGS) $(OT_DEP_LZMA_CFLAGS) $(OT_DEP_ZLIB_CFLAGS) $(OT_DEP_OPENSSL_CFLAGS) \
+<SECTION>
+<FILE>ostree-remote</FILE>
+OstreeRemote
+ostree_remote_ref
+ostree_remote_unref
+</SECTION>
* --enable-experimental-api. They are not stable or officially supported, and
* might disappear or change in future releases. */
-/*
LIBOSTREE_2017.6_EXPERIMENTAL {
global:
- some_symbol;
+ ostree_remote_ref;
+ ostree_remote_unref;
} LIBOSTREE_2017.6;
-*/
G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (OstreeRepoCommitTraverseIter, ostree_repo_commit_traverse_iter_clear)
+#ifdef OSTREE_ENABLE_EXPERIMENTAL_API
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeRemote, ostree_remote_unref)
+#endif /* OSTREE_ENABLE_EXPERIMENTAL_API */
+
#endif
G_END_DECLS
--- /dev/null
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright © 2011 Colin Walters <walters@verbum.org>
+ * Copyright © 2015 Red Hat, Inc.
+ * Copyright © 2017 Endless Mobile, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * - Colin Walters <walters@verbum.org>
+ * - Philip Withnall <withnall@endlessm.com>
+ */
+
+#pragma once
+
+#include <gio/gio.h>
+#include <glib.h>
+#include <glib-object.h>
+
+#include "libglnx.h"
+#include "ostree-remote.h"
+#include "ostree-types.h"
+
+G_BEGIN_DECLS
+
+struct OstreeRemote {
+ volatile int ref_count;
+ char *name;
+ char *group; /* group name in options */
+ char *keyring; /* keyring name (NAME.trustedkeys.gpg) */
+ GFile *file; /* NULL if remote defined in repo/config */
+ GKeyFile *options;
+};
+
+G_GNUC_INTERNAL
+OstreeRemote *ostree_remote_new (void);
+
+G_GNUC_INTERNAL
+OstreeRemote *ostree_remote_new_from_keyfile (GKeyFile *keyfile,
+ const gchar *group);
+
+#if (defined(OSTREE_COMPILATION) || GLIB_CHECK_VERSION(2, 44, 0)) && !defined(OSTREE_ENABLE_EXPERIMENTAL_API)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeRemote, ostree_remote_unref)
+#endif
+
+G_END_DECLS
--- /dev/null
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright © 2011 Colin Walters <walters@verbum.org>
+ * Copyright © 2015 Red Hat, Inc.
+ * Copyright © 2017 Endless Mobile, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * - Colin Walters <walters@verbum.org>
+ * - Philip Withnall <withnall@endlessm.com>
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+#include <glib.h>
+#include <glib-object.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "ostree-remote.h"
+#include "ostree-remote-private.h"
+#include "ot-keyfile-utils.h"
+
+/**
+ * SECTION:remote
+ *
+ * The #OstreeRemote structure represents the configuration for a single remote
+ * repository. Currently, all configuration is handled internally, and
+ * #OstreeRemote objects are represented by their textual name handle, or by an
+ * opaque pointer (which can be reference counted if needed).
+ *
+ * #OstreeRemote provides configuration for accessing a remote, but does not
+ * provide the results of accessing a remote, such as information about what
+ * refs are currently on a remote, or the commits they currently point to. Use
+ * #OstreeRepo in combination with an #OstreeRemote to query that information.
+ *
+ * Since: 2017.6
+ */
+
+OstreeRemote *
+ostree_remote_new (void)
+{
+ OstreeRemote *remote;
+
+ remote = g_slice_new0 (OstreeRemote);
+ remote->ref_count = 1;
+ remote->options = g_key_file_new ();
+
+ return remote;
+}
+
+OstreeRemote *
+ostree_remote_new_from_keyfile (GKeyFile *keyfile,
+ const gchar *group)
+{
+ g_autoptr(GMatchInfo) match = NULL;
+ OstreeRemote *remote;
+
+ static gsize regex_initialized;
+ static GRegex *regex;
+
+ if (g_once_init_enter (®ex_initialized))
+ {
+ regex = g_regex_new ("^remote \"(.+)\"$", 0, 0, NULL);
+ g_assert (regex);
+ g_once_init_leave (®ex_initialized, 1);
+ }
+
+ /* Sanity check */
+ g_return_val_if_fail (g_key_file_has_group (keyfile, group), NULL);
+
+ /* If group name doesn't fit the pattern, fail. */
+ if (!g_regex_match (regex, group, 0, &match))
+ return NULL;
+
+ remote = ostree_remote_new ();
+ remote->name = g_match_info_fetch (match, 1);
+ remote->group = g_strdup (group);
+ remote->keyring = g_strdup_printf ("%s.trustedkeys.gpg", remote->name);
+
+ ot_keyfile_copy_group (keyfile, remote->options, group);
+
+ return remote;
+}
+
+/**
+ * ostree_remote_ref:
+ * @remote: an #OstreeRemote
+ *
+ * Increase the reference count on the given @remote.
+ *
+ * Returns: (transfer full): a copy of @remote, for convenience
+ * Since: 2017.6
+ */
+OstreeRemote *
+ostree_remote_ref (OstreeRemote *remote)
+{
+ gint refcount;
+ g_return_val_if_fail (remote != NULL, NULL);
+ refcount = g_atomic_int_add (&remote->ref_count, 1);
+ g_assert (refcount > 0);
+ return remote;
+}
+
+/**
+ * ostree_remote_unref:
+ * @remote: (transfer full): an #OstreeRemote
+ *
+ * Decrease the reference count on the given @remote and free it if the
+ * reference count reaches 0.
+ *
+ * Since: 2017.6
+ */
+void
+ostree_remote_unref (OstreeRemote *remote)
+{
+ g_return_if_fail (remote != NULL);
+ g_return_if_fail (remote->ref_count > 0);
+
+ if (g_atomic_int_dec_and_test (&remote->ref_count))
+ {
+ g_clear_pointer (&remote->name, g_free);
+ g_clear_pointer (&remote->group, g_free);
+ g_clear_pointer (&remote->keyring, g_free);
+ g_clear_object (&remote->file);
+ g_clear_pointer (&remote->options, g_key_file_free);
+ g_slice_free (OstreeRemote, remote);
+ }
+}
--- /dev/null
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright © 2011 Colin Walters <walters@verbum.org>
+ * Copyright © 2015 Red Hat, Inc.
+ * Copyright © 2017 Endless Mobile, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * - Colin Walters <walters@verbum.org>
+ * - Philip Withnall <withnall@endlessm.com>
+ */
+
+#pragma once
+
+#include <gio/gio.h>
+#include <glib.h>
+#include <glib-object.h>
+
+#include "ostree-types.h"
+
+G_BEGIN_DECLS
+
+/**
+ * OstreeRemote:
+ *
+ * This represents the configuration for a single remote repository. Currently,
+ * remotes can only be passed around as (reference counted) opaque handles. In
+ * future, more API may be added to create and interrogate them.
+ *
+ * Since: 2016.7
+ */
+#ifndef OSTREE_ENABLE_EXPERIMENTAL_API
+/* This is in ostree-types.h otherwise */
+typedef struct OstreeRemote OstreeRemote;
+#endif
+
+_OSTREE_PUBLIC
+OstreeRemote *ostree_remote_ref (OstreeRemote *remote);
+_OSTREE_PUBLIC
+void ostree_remote_unref (OstreeRemote *remote);
+
+G_END_DECLS
#pragma once
#include "ostree-repo.h"
+#include "ostree-remote-private.h"
#include "libglnx.h"
G_BEGIN_DECLS
_ostree_repo_update_mtime (OstreeRepo *self,
GError **error);
+void
+_ostree_repo_add_remote (OstreeRepo *self,
+ OstreeRemote *remote);
+OstreeRemote *
+_ostree_repo_get_remote (OstreeRepo *self,
+ const char *name,
+ GError **error);
+OstreeRemote *
+_ostree_repo_get_remote_inherited (OstreeRepo *self,
+ const char *name,
+ GError **error);
+
G_END_DECLS
#include <glnx-console.h>
#include "ostree-core-private.h"
+#include "ostree-remote-private.h"
#include "ostree-repo-private.h"
#include "ostree-repo-file.h"
#include "ostree-repo-file-enumerator.h"
#define SYSCONF_REMOTES SHORTENED_SYSCONFDIR "/ostree/remotes.d"
-typedef struct {
- volatile int ref_count;
- char *name;
- char *group; /* group name in options */
- char *keyring; /* keyring name (NAME.trustedkeys.gpg) */
- GFile *file; /* NULL if remote defined in repo/config */
- GKeyFile *options;
-} OstreeRemote;
-
-static OstreeRemote *
-ost_remote_new (void)
-{
- OstreeRemote *remote;
-
- remote = g_slice_new0 (OstreeRemote);
- remote->ref_count = 1;
- remote->options = g_key_file_new ();
-
- return remote;
-}
-
-static OstreeRemote *
-ost_remote_new_from_keyfile (GKeyFile *keyfile,
- const gchar *group)
-{
- g_autoptr(GMatchInfo) match = NULL;
- OstreeRemote *remote;
-
- static gsize regex_initialized;
- static GRegex *regex;
-
- if (g_once_init_enter (®ex_initialized))
- {
- regex = g_regex_new ("^remote \"(.+)\"$", 0, 0, NULL);
- g_assert (regex);
- g_once_init_leave (®ex_initialized, 1);
- }
-
- /* Sanity check */
- g_return_val_if_fail (g_key_file_has_group (keyfile, group), NULL);
-
- /* If group name doesn't fit the pattern, fail. */
- if (!g_regex_match (regex, group, 0, &match))
- return NULL;
-
- remote = ost_remote_new ();
- remote->name = g_match_info_fetch (match, 1);
- remote->group = g_strdup (group);
- remote->keyring = g_strdup_printf ("%s.trustedkeys.gpg", remote->name);
-
- ot_keyfile_copy_group (keyfile, remote->options, group);
-
- return remote;
-}
-
-static OstreeRemote *
-ost_remote_ref (OstreeRemote *remote)
-{
- gint refcount;
- g_return_val_if_fail (remote != NULL, NULL);
- refcount = g_atomic_int_add (&remote->ref_count, 1);
- g_assert (refcount > 0);
- return remote;
-}
-
-static void
-ost_remote_unref (OstreeRemote *remote)
-{
- g_return_if_fail (remote != NULL);
- g_return_if_fail (remote->ref_count > 0);
-
- if (g_atomic_int_dec_and_test (&remote->ref_count))
- {
- g_clear_pointer (&remote->name, g_free);
- g_clear_pointer (&remote->group, g_free);
- g_clear_pointer (&remote->keyring, g_free);
- g_clear_object (&remote->file);
- g_clear_pointer (&remote->options, g_key_file_free);
- g_slice_free (OstreeRemote, remote);
- }
-}
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(OstreeRemote, ost_remote_unref)
-
-static OstreeRemote *
-ost_repo_get_remote (OstreeRepo *self,
- const char *name,
- GError **error)
+OstreeRemote *
+_ostree_repo_get_remote (OstreeRepo *self,
+ const char *name,
+ GError **error)
{
OstreeRemote *remote = NULL;
remote = g_hash_table_lookup (self->remotes, name);
if (remote != NULL)
- ost_remote_ref (remote);
+ ostree_remote_ref (remote);
else
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
"Remote \"%s\" not found", name);
return remote;
}
-static OstreeRemote *
-ost_repo_get_remote_inherited (OstreeRepo *self,
- const char *name,
- GError **error)
+OstreeRemote *
+_ostree_repo_get_remote_inherited (OstreeRepo *self,
+ const char *name,
+ GError **error)
{
g_autoptr(OstreeRemote) remote = NULL;
g_autoptr(GError) temp_error = NULL;
- remote = ost_repo_get_remote (self, name, &temp_error);
+ remote = _ostree_repo_get_remote (self, name, &temp_error);
if (remote == NULL)
{
if (self->parent_repo != NULL)
- return ost_repo_get_remote_inherited (self->parent_repo, name, error);
+ return _ostree_repo_get_remote_inherited (self->parent_repo, name, error);
g_propagate_error (error, g_steal_pointer (&temp_error));
return NULL;
return g_steal_pointer (&remote);
}
-static void
-ost_repo_add_remote (OstreeRepo *self,
- OstreeRemote *remote)
+void
+_ostree_repo_add_remote (OstreeRepo *self,
+ OstreeRemote *remote)
{
g_return_if_fail (self != NULL);
g_return_if_fail (remote != NULL);
g_mutex_lock (&self->remotes_lock);
- g_hash_table_replace (self->remotes, remote->name, ost_remote_ref (remote));
+ g_hash_table_replace (self->remotes, remote->name, ostree_remote_ref (remote));
g_mutex_unlock (&self->remotes_lock);
}
return TRUE;
}
- remote = ost_repo_get_remote (self, remote_name, &temp_error);
+ remote = _ostree_repo_get_remote (self, remote_name, &temp_error);
if (remote != NULL)
{
value = g_key_file_get_string (remote->options, remote->group, option_name, &temp_error);
return TRUE;
}
- remote = ost_repo_get_remote (self, remote_name, &temp_error);
+ remote = _ostree_repo_get_remote (self, remote_name, &temp_error);
if (remote != NULL)
{
value = g_key_file_get_string_list (remote->options,
return TRUE;
}
- remote = ost_repo_get_remote (self, remote_name, &temp_error);
+ remote = _ostree_repo_get_remote (self, remote_name, &temp_error);
if (remote != NULL)
{
value = g_key_file_get_boolean (remote->options, remote->group, option_name, &temp_error);
self->remotes = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) NULL,
- (GDestroyNotify) ost_remote_unref);
+ (GDestroyNotify) ostree_remote_unref);
g_mutex_init (&self->remotes_lock);
self->repo_dir_fd = -1;
if (strchr (name, '/') != NULL)
return glnx_throw (error, "Invalid character '/' in remote name: %s", name);
- g_autoptr(OstreeRemote) remote = ost_repo_get_remote (self, name, NULL);
+ g_autoptr(OstreeRemote) remote = _ostree_repo_get_remote (self, name, NULL);
if (remote != NULL && if_not_exists)
{
/* Note early return */
name, remote->file ? gs_file_get_path_cached (remote->file) : "(in config)");
}
- remote = ost_remote_new ();
+ remote = ostree_remote_new ();
remote->name = g_strdup (name);
remote->group = g_strdup_printf ("remote \"%s\"", name);
remote->keyring = g_strdup_printf ("%s.trustedkeys.gpg", name);
return FALSE;
}
- ost_repo_add_remote (self, remote);
+ _ostree_repo_add_remote (self, remote);
return TRUE;
}
g_autoptr(OstreeRemote) remote = NULL;
if (if_exists)
{
- remote = ost_repo_get_remote (self, name, NULL);
+ remote = _ostree_repo_get_remote (self, name, NULL);
if (!remote)
{
/* Note early return */
}
}
else
- remote = ost_repo_get_remote (self, name, error);
+ remote = _ostree_repo_get_remote (self, name, error);
if (remote == NULL)
return FALSE;
/* First make sure the remote name is valid. */
- remote = ost_repo_get_remote_inherited (self, name, error);
+ remote = _ostree_repo_get_remote_inherited (self, name, error);
if (remote == NULL)
goto out;
out:
if (remote != NULL)
- ost_remote_unref (remote);
+ ostree_remote_unref (remote);
if (source_tmp_dir != NULL)
(void) glnx_shutil_rm_rf_at (AT_FDCWD, source_tmp_dir, NULL, NULL);
{
OstreeRemote *remote;
- remote = ost_remote_new_from_keyfile (keyfile, groups[ii]);
+ remote = ostree_remote_new_from_keyfile (keyfile, groups[ii]);
if (remote != NULL)
{
out:
while (!g_queue_is_empty (&queue))
- ost_remote_unref (g_queue_pop_head (&queue));
+ ostree_remote_unref (g_queue_pop_head (&queue));
g_mutex_unlock (&self->remotes_lock);
OstreeRemote *remote;
g_autoptr(GFile) file = NULL;
- remote = ost_repo_get_remote_inherited (self, remote_name, error);
+ remote = _ostree_repo_get_remote_inherited (self, remote_name, error);
if (remote == NULL)
return NULL;
if (gpgkeypath)
_ostree_gpg_verifier_add_key_ascii_file (verifier, gpgkeypath);
- ost_remote_unref (remote);
+ ostree_remote_unref (remote);
}
if (add_global_keyring_dir)
typedef struct OstreeMutableTree OstreeMutableTree;
typedef struct OstreeRepoFile OstreeRepoFile;
+#ifdef OSTREE_ENABLE_EXPERIMENTAL_API
+typedef struct OstreeRemote OstreeRemote;
+#endif
+
G_END_DECLS
#include <ostree-core.h>
#include <ostree-repo.h>
#include <ostree-mutable-tree.h>
+#ifdef OSTREE_ENABLE_EXPERIMENTAL_API
+#include <ostree-remote.h>
+#endif
#include <ostree-repo-file.h>
#include <ostree-sysroot.h>
#include <ostree-sysroot-upgrader.h>
projects / ostree.git / commitdiff